+ Update all the places that use "Person" as an available lava merge field for the current person to use "CurrentPerson" instead