MDL-20636 Merge branch 'master' into qe2_wip