Merged from 6.6.3.a1 branch