Merged in v1.64