Creating branch for person removal, related to #3131
Not escaping JSON for refine fields.
Copying to move to java8