Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-11-28' into staging