Merge "T4xx fixes"