Merge pull request #5730 from mallezie/domain-addfield