refs #6009. Fix error.
Merge branch 'feature/6009_phi' into develop