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