MBS-5926: Do not expose private collection names
Merge branch 'mbs-5926' into beta