refs #9396 System test complain fixed
Merge remote-tracking branch 'origin/feature/9396_ConvertToMDHelpersNames'