Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev