Merge remote-tracking branch 'riscv/riscv-fix-32bit' into fixes