Merge "Remove hidden compatibility constants from Intdef" into main