Add new optional fields to definitions (4.9.0) Closes #955 and #984 See merge request inject/frontend!848