Merged in v1.60 but not cleaned up