Merge branch 'release/7.x-1.26' into develop
version 7.x-1.27
Merge branch 'release/7.x-1.27'