refs #6763. Fix returns non-workspace.
Merge branch 'feature/6763_signature' into develop