fix copy paste error
Merge branch '2.2.x'