Merge pull request #5845 from mallezie/demographics-add-field