Merge branch 'py12' into 'master'