upgraded to version 7.26
Merge branch 'dev'