version & changelog
Merge branch 'release/2.26' into develop