update with latest 2.11.x changes