Merge "fix(tc): change the FIP offset to 8 KiB boundary" into integration