Fix ipa service being executed by client
Merge branch 'develop'