Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-pull-request' into staging