Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-07-02' into staging