Updated ZEN-9211 issue