Version 2.26.0
Merge branch 'release/v2.26.0' into develop