T3: Update J3.2 compatible