Fixes bugs in the recent collection framework implementation
Merge remote-tracking branch 'origin/master'