Merge "fix(rme/fid): refactor RMI fid macros"