Merge "[CDM][Refactoring 8/N] Make maxId global" into main