Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-07-19' into staging