[4.2] Fixed Collection Docblocks

Replaces #4902.