Merged v1.65