Merge "fix(tc): remove timer interrupt from G1S" into integration