Merge "Workaround IPHONE problem" into klp-wireless-dev