[TASK] Make extension compatible with 6.2.x