Merged 1b2b into v1.60 from v1.55