Changes to code for defect ZEN-11384