Merge changes I6c2c80ad,I833d4c46 into main

* changes:
  Final cleanup.
  Events and CUJs parsers.