Bumped version
Bumped version
Merge branch 'release/0.12.3' into develop