3.16: support cid prepends