Refs #8959 Fix for tests
Merge branch 'feature/8959_SaveReflCustomAlgor' into develop