Fix for ZEN-9319