Merged in v1.63