refs #8044 this should fix it
Merge branch 'feature/8044_noGoniometer' into develop