Support Morocco
Merge branch 'support-more-countries' into custom