Merge pull request #18483 from oskarirauta/nsutils