Merge branch 'release/7.x-0.18' into develop
update field information
update release version
Merge branch 'release/7.x-0.18.1'