Merge tag '1.12.2' into develop

1.12.2
Merge branch 'master' into develop
Bumped to 1.12.3
Merge branch 'release/1.12.3'