public so field validation fixed
Merge branch 'devel' into new-datamodel