Merge "Merge release-2019 into master"