Release 1.2.3
Merge branch 'release/1_2_3' into dev