Fix for ZEN-13546