Fixes TS-96: Block Grid: better content collection implementation (rel. TS-60)
TS-86: Stripping of extra wrapper around content collection (rel. TS-89, TS-96)