am 221b822c: Merge "Workaround IPHONE problem" into klp-modular-dev

* commit '221b822ce1c42f4a51abc384cf09ca09b6180a9c':
  Workaround IPHONE problem