Updating version
Merge branch 'release/v1.2.4' into develop