Follow up !1797

Rosen Matevrequested to merge
rm-follow-1797 into master

should solve remaining failures on gcc11-dbg and clang12-opt

/cc @sesen

Merge request reports