Catchup branch with mundane master fixes