Merge branch 'release-3.24'

2 jobs for stage/master/base in 4 minutes and 26 seconds (queued for 4 seconds)