Fix for ZEN-9298