Merge "softrvv: fix incompatible type"