[connector:php:local] optimize fcaaf635dc3d587f2030e8debbeee35dff2cf2d1
Merge branch '2.x' into 2.1
Merge branch '2.1' into 2.1_n