Sync'd with v1.65