Fixed accidental removal of PersonAddress at merge