apply e065056d597dc94ac3309af8582069bffcdfb276 to master
Merge branch 'master' into cleanup-tests