Updated v6.6.x branch to upstream v6.6.x