Issue #415
Issue #449
Merge branch 'develop_IOS' into develop