Merge branch 'release-3.19' into release-3.20