[ALOY-440] Support dynamic collections on picker
Merge pull request #514 from skypanther/ALOY-440c

[ALOY-440] Support dynamic collections on picker