@LudwigOrtmann I think you should fix all stuff in native (or upstream these c++ changes via your hands)