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