Merge "fix(tc): resolve the static-checks errors" into integration