Updated ZEN-9321 issue