Merge branch 'release-3.19'