Fixes for Python3
Version bump
Merge branch 'release/2.12.1' into develop