Merge #21: Add RNME handlers for server/client