Merge branch 'master' into py39