BLAMENOS-21673

BLAMENOS-21673