Merge "Freeze current as compatibility_matrix.3.xml." into pi-dev