refs #9396 System test complain fixed
Merge branch 'feature/9396_ConvertToMDHelpersNames' into develop