Fixed issue but needs IS test to be sure. This refs #8136
Merge branch 'feature/8136_check_data_reduced' into develop