Merge pull request #10344 from lucize/nsprup