Bier-8942

VKU-8925
Bier-8943