Merge "cas: fix missing error code conversion" into oc-mr1-dev