Merge "Self Managed CS Implementation"