Merged changes on v1.55 branch