Merge branch 'feature/7874_muon_remove_signals' into develop