Merge branch 'release-3.19' into master