Merge pull request from p2pu/2021-01-message-schedule Updated message schedule