Merge "compatibility matrices: drop optional=true. (202404)" into main