Refs #6848 get develop test working for #6469
Merge branch 'feature/6848_FindGon' into develop