VKU-8906

VKU-8905
VKU-8917