[TASK] Make extension 6.2 compatible