refs #6753. Signature changed.
Merge branch 'feature/6753_hkl' into develop