version 7.x-0.24
Merge branch 'release/7.x-0.24' into develop