version update
Merge branch 'release/1.2.4' into develop