Merge 'c3fa6e3a4dd14354f365a71d35011576179a01da' from master
 * remaining changes to get tests running again