change layout
update package version
Merge branch 'release/v2.2.18' into develop