backport multiple commits

Backport from master these bug fixes:

backport: release

Edited by Lucas Givord

Merge request reports

Loading