Fixed ZEN-11294 issue