Merge branch 'release/2.6' into master #678

Closed uddr closed 1 week ago