Merge release-2019 branch into master