Merged 1f7e from v1.55 into v1.60