Fixed defect ZEN-7882