Merge "compatibility_matrix: specify @1.2::ISap directly" into qt-dev