Merging latest from boris

please pull