Integration to mainline