fix enbug of @aa24cf92d84cd560049ac6ed2390c82575540764
Merge branch '2.x' into 2.1