Fix for ZEN-15606