2.2.x improvements