NSD 1.2.2 will be released probably next week, so it would be best not to commit this for the moment, as there are a couple of important bug fixes. I'll update this PR with the relevant patches when the time comes. Nick