Merge "Add new semantic Person fields" into pi-dev