Import of 6.6
Merge branch 'master' into ServerLog Update to 6.6