* Partial changes made when merging collections into the dev branch.