Merge "pdx: Rework error reporting when transfering file and channel handles" into oc-dev