Release 1.2.4
Merge branch 'release/v1_2_4' into dev