Merge "refactor(fvp_r): remove duplicated macro definitions" into integration