[TASK] 6.2 compatibility