Merge "Fix Opus CSD-1 and CSD-2"