refs #4843 Solved potential merge conflict