ResolveRelativePath fixes for iOS
Merge pull request #3134 from Andreyul/ResolveRelativePath

ResolveRelativePath fixes for iOS