2.x: 24448 Updates features to 2.2