petermattis Merge pull request #17425 from petermattis/pmattis/lockosthread …