SetGoniometer small changes. Refs #6793
Merge branch 'feature/6793_setGoniometer_improvement' into develop