Fix for ZEN-13662