release 7.x-1.18
Merge branch 'release/7.x-1.18' into develop