Merge tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier...