Pseudomerge of branch 'release/7.x-0.13+dbc.6' into develop