Merge "fix(trp): preserve RMI SMC X4 when not used as return" into integration