Cherrypicking this MR that went into master: Merge branch 'riscv64-fix' into 'master'
Try to fix Debian riscv64 build
See merge request !1109 (merged)
(cherry picked from commit afb1937c)
3d555900 Try to fix Debian riscv64 build
Edited by Maiken