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