ZEN-13928: additional fields are now disabled by default