Merge "Self Managed CS Implementation" into oc-dev