Merge "BUG-6109: Having a null match field is totally fine."