GIRAFFE-31147

GIRAFFE-31147