Merge "fix(fvp_r): fix compilation error in release mode" into integration