Pull upstream changes

`collections` -> `viewModels`