Merge remote-tracking branch 'origin/develop' into xap

tmk_core/protocol/usb_descriptor.c

@@ -45,9 +45,6 @@
 #    include "joystick.h"
 #endif
 
-// TODO: wb32 support defines ISO macro which breaks PRODUCT stringification
-#undef ISO
-
 // clang-format off
 
 /*