Add change option to setCollection
Merge branch 'setCollection-change-option-233'