Refs #7449 fix Mac builds
Merge branch 'feature/7449_signal_noise' into develop