Merge branch 'dev'
release 2.26.1