Tagging version 7.x-2.6
Merge branch 'release/7.x-2.6' into develop