Merge "Add dariofreni/ioffe for cts shim packages" into rvc-dev