Merged e7a3 from v1.55 branch into v1.60 branch