[TASK] Workaround for supporting T3 6.2