[sr-dev] git:master: Merge branch 'luismartingil/msrp_crash'