Merge remote-tracking branch 'remotes/armbru/tags/pull-build-2019-07-15' into staging