Bring in v7.00 code (major update)
Merge branch 'release/v7.00'