bumped to version 3.12.1
Merge branch 'develop'