Merged v1.63 to trunk