Merge branch 'master' into ATLAS-5123