15 Commits (fixes/appium2)