Bringing in latest changes from v1.64