Merge pull request #3932 from Dineshs91/ndr-fix