Merge "Fix unit tests to correctly consider CompatChanges" into main