Merged remaining change from v1.65