Merge branch 'release/7.x-0.22+dbc.6' into develop
update version
Merge branch 'release/7.x-0.22+dbc.7'