VKU-8917

VKU-8906
VKU-8918