Issue #3618985: Improved field logic, added test coverage.

Closes #3618985

Merge request reports

Loading