manually merged remaining mobility lab changes