Merged in v1.65