Pass along the collectionId so it can be correctly used
Merge remote-tracking branch 'origin/master' into fix-press-format