Merge "Codec2: more adjustments for C2Work related changes"