Merge pull request #9341 from lucize/nssup