bumped to version 3.12.0
Merge branch 'develop'