Introduced the IdAndXor inner class to fix the GSON-related issue of map keys conversion
Merge branch 'feature-messagetypes' into develop