[TASK] second changes for 6.2 compatbility