Merge branch release-2018 into release-2019