Merge "fix(xlat): fix bug on VERBOSE trace" into integration