release 7.x-1.24
Merge branch 'release/7.x-1.24' into develop