Issue #2797121 by dpi, nyariv, almaudoh: Separate entity phone number from verification service for flexibility