KINDER-8884

KINDER-8882
KINDER-8899