Merge "fix(xlat): remove always true check in assert" into integration