Handle collection as well
Merge remote-tracking branch 'origin/master'
Merge REMERGE_HEAD