Merge branch 'release/3.5.7'
Merge branch 'hotfix/3.5.8'
phone number by locale
bump
Merge branch 'release/3.6.0' into production