24448 Update to features 2.2