Update changelog
Merge branch 'release/2.2.6' into develop