1.25 -> 1.26
Merge branch 'release/1.26' into develop