[KA-1961]

[KA-1961]