[TASK] 6.2 compatibility

Resolves: #58656
Merge pull request #22 from MaxServ/master

[TASK] 6.2 compatibility