Merge pull request #2959 from markscott-ms/feat/2947-consolidate-require-namespace