Bring in v7.02 code
Merge branch 'release/v7.02'