Feature2.0 fix01

Feature2.0 fix01