Import of 6.6
Update to 6.6