refs #6009. Label change.
Merge branch 'feature/6009_phi' into develop