Bring in v7.02 code