Fix for ZEN-11287