Merge branch 'develop' into VALG-28
VALG 28 - Fix field settings.
Merge branch 'VALG-28' into develop