Closing as out of date: this is being done progressively as we migrate code from Search 5 to Search 6.