Modify by add 2 lines
Merge branch 'master' into revert_1