Merge pull request #1715 from TheBlueMatt/2022-09-fix-msg-send