ADD: Collection ATTR into optional fields
Merge branch 'trunk'; commit 'bb2b2183aee133a2ac5c4a2642259321c25f2be3' into trunk
Partial Fixed