Merge pull request #4762 from solgenomics/topic/fieldmap-d3V3-fix