Fix builder model with collection
Merge branch '1.0' into 1.1
Fix unit tests
Merge branch '1.0' into 1.1
Merge branch '1.1'