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