DEP-183 #comment Rename & added impl for context service