Fix for MWGR5
Merge pull request #5017 from borrello/FixForMWGR5

Fix for MWGR5