refs #9661. Fixes made.
Merge branch 'feature/9661_tidy_hybrid' into develop