[sr-dev] git:pd/msrp: Merge branch 'master' into msrp