KINDER-8921

KINDER-8899
KINDER-8936