ZEN-22769

ZEN-22769