Merge branch 'release/5.26.0'