Merge "fix(fvp):  FCONF Trace Not Shown" into integration