Merged v1.65 changes