Merge "Initial changes to allow collections in widgets."