Merge branch 'release-3.18' into release-3.19