Merge branch 'release-3.23' into release-3.24