Merge "compat matrix: add ISap slot2" into main