Merge "Fix JDWP count event modifier"