Resolve field name counter in discover project
Merge branch 'hotfix/add-field-population' into develop