Version bump
Merge branch 'release/v1.2b3' into develop