Merge "Cleanup handleClientMessageCallback" into main