Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...