first stab at upgrading to 4.10.0. Testing with real index is needed.