Merge branch 'release/7.x-0.25' into develop
update to version 7.x-0.26
Merge branch 'release/7.x-0.26'