Merge branch 'release/7.x-0.22+dbc.12' into develop
version 7.x-0.22+dbc.13
Merge branch 'release/7.x-0.22+dbc.13'