Merge pull request #2384 from jkczyz/2023-06-message-router