Merge "fix(fvp): fix NULL pointer dereference issue" into integration