Merge branch 'hotfix/podfile' into develop