Merge pull request from p2pu/2021-03-message-copy-updates Update message copy