Merge branch 'release-2019' into master