Merge "Compatibility_matrix: s/current/4/"