Merge branch '3-remove-unused-fields-from-member-records' into 'master'