Fix for ZEN-15084