Merged in v1.62