KINDER-8860

KINDER-8849
KINDER-8882