Merged minor change to v1.65