CSHARP-1047: Finished improvement