Merge "fix(rme/fid): refactor RME fid macros" into integration