v6.0.4 release
Merge branch 'master' into development