Merge "Merge branch release-2018 into release-2019" into release-2019