Merge pull request #4618 from BrzVlad/feature-par-nrs