Fixed defect ZEN-13368