CERBERUS-25456

CERBERUS-25456