Backport: release
Do: test
This merge request has been queued for testing. Test results may be viewed on:
Branch-at-master: 9170c751 Branch-at-release: 9170c751
Do: merge
mentioned in commit 9c76db0b
mentioned in commit 8b12c5db
merged