Merge pull request #3129 from optout21/splicing-msgs-update