resolved merge conflicts
fixing mismatches between versions
Merge branch 'hotfix-6.0.4' into support-6.0