Merge commit 'ms/nrpe'