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