Merging code with new project structure and async await changes
Merged code with latest changes around iOS and Common project setup