rebase according to new code base First fixed by: gym369 <gym487@163.com> (cherry picked from commit 066383dcd56bad1c5fefdb35dd58b9e43343c4de)