Merge branch '20190626-01' into 'master' Take 2
This tag has no release notes.