Merge with main and remove leftovers under JBM_TSM_ON_TCS