refs #8044 this should fix it
Merge remote-tracking branch 'origin/feature/8044_noGoniometer'