Applied the following patches to make the UK number acceptable.
requested review from @Yalu
assigned to @Yalu
merged