Fixed ios manifest parse issue
Merge branch 'develop' into feature/mam-mdm-merge