I don't want to block this PR on that. Maybe we can do it at the same time we fix the mandatory MSISDN field?