Merge branch 'rs/checkout-am-fix-unborn'