Merge pull request #4752 from BrzVlad/feature-dynamic-nrs