Update tools to core version 2.2, prepared for Labs