Unique endpoints for iOS devices
Merge branch 'Development'