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