Refs #7449 fixed usability issues found in testing
Merge branch 'feature/7449_signal_noise' into develop