Merging in recent fixed from v1.64