Merge "DO NOT MERGE: Decode the input of both setStream and setResource calls first" into sc-dev