2.6 fixes
7 files changed