Merged v1.65 fixes