Refs #8116 Correction for system test.
Merge branch 'feature/8116_fltabs_code_tidy' into develop