Merge changes If8f281ec,Id711ba79 into main

* changes:
  bump.py remove Level.h dependency
  Update bump.py for Trunk Stable