Fix for ZEN-13588