refs #7541. Change collection type.
Merge branch 'feature/7541_replace_workspace' into develop