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