TP-396 - Person Address Optionally Required (Field Settings - Page 3)
TP-399 - The merged person still appears in some fields, or the fields display a blank value instead of referencing the new person