Merge "Bug 559403: Slow integration with Zephyr"