Merge fix Classic of TC into 1.12.3