Updated features to 7.x-2.2