Merge remote-tracking branch 'origin/update-to-2019-march-june-release' into integration_develop-nr_2019w32