THISTED-2 - Fix and set field as optional.
Merge branch 'THISTED-2' into develop