Add info about mandatory or optional in edit view
Merge branch 'develop'