KINDER-8899

KINDER-8884
KINDER-8921