Refs #8550. Windows error and a general warning fix.
Merge branch 'feature/8550_muon_tidy_up_grouping' into develop