ZEN-13928: adding new options