Fix grammar
Merge 3.4