Collection fix
Merge branch 'release'