core bundle is about to move to 2.2 as well