Fix for ZEN-11090