Merge "All hals are marked optional in compatibility matrices (U)"