Merge pull request #1751 from marcin1j/patchwork/nbd