Merge branch 'release/1.2.4' into production
Merge tag 'v1.2.4'

1.2.4