SC - Collections edits
Merge branch 'SC-edits' into staging