CERBERUS-22777

CERBERUS-22777