some work on extended profile fields
Merge remote branch 'upstream/master'