Merge "Self managed CS implementation."