Merged in fixes from v1.60 branch