Merge "Sort channels and groups by id" into oc-dev