Apply 10gen patch for CS-6204