Merge "Fix configuration error in TC025"