Merge "Fix Match intersection logic"