CMS-833 Add content id to RPC responses