Merge "Filter out empty phone number" into main