Merge "Revert "Decode the input of both setStream and setResource calls first"" into sc-v2-dev