[sr-dev] git:master:e80fcf42: Merge pull request #2542 from guillemj/pu/rpc-marshalling