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