Pulled in some missing changes from v1.64