Merge branch 'release-3.20' into release-3.21