Merge tag '0.12.1' into develop

Released-0.12.1 0.12.1
implemented orm update
bumped version
Merge branch 'release/0.12.2'