fix ios and rest api v3
Merge branch 'dev'