Merge branch 'release/7.x-0.18.1' into develop
update to 7.x-0.18.2
Merge branch 'release/7.x-18.2'