refs #7228 fixed strange error with kernel header
Merge branch 'feature/7228_ConverToMDPerformance' into develop