Merge "Fix misleading transcoding exception" into sc-dev