Merged v1.63 into trunk