Updated version
Merge branch 'release/1.0.24' into develop