Draft: Fix/fixes from 5.4 march 2

Closed Simon Morlat requested to merge fix/fixes-from-5.4-march-2 into master

Merge request reports