Refs #8116 Add check for platform.
Merge branch 'feature/8116_fltabs_code_tidy' into develop