Merge pull request #5818 from mallezie/commpref-addfield