Refs #7965 Fix broken system tests on develop
Merge branch 'feature/7965_updateQLines_ws_format' into develop