Merged in v1.62-side