Merge pull request #3921 from Dineshs91/ndr-fix