BIC-116 # use `Forms.flattenDefinition()`
Merge branch 'feature/BIC-116' into develop