These modules are needed for frozen Windows builds
Merge pull request #8143 from UtahDave/develop

These modules are needed for frozen Windows builds