Merge pull request #2967 from tnull/2024-03-refactor-drop-handle-message