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