Fixed ZEN-9321 and updated ZEN-9312 issues