Merge pull request #1526 from clebertsuconic/master-scop

Collection initialization/sizing improvements
refactor client protocol