Merge from Branch 6.6.3.a1