Syncing up with v1.65