Resolve "Create definitions for RAI (sub-)options"

Merged Francis Dupont requested to merge 2357-create-definitions-for-rai-sub-options into master
Edited by Francis Dupont

Merge request reports