CONSTANTIN-2435

CONSTANTIN-2435