Fix for ZEN-15112