Fix for ZEN-13580