Merge branch 'luismartingil/msrp_crash'
(cherry picked from commit 4a9a98a07869a2415b82b70b23907ccd490d6c12)