Merged v1.66 to trunk