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