@stepan-a Should this commit be cherry-picked to 6.x?
6.x
mentioned in commit 55c110e1
I did the backport.