Merge pull request #2544 from optout21/splicing-msgs0