[TASK] 6.2 compatibility

Resolves: #58656