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