Merge branch 'cw/no-detaching-an-unborn'