Merge https://gerrit.lilingkun.com/G8Backend into whx

Change-Id: Ie5d758f4ffa68a5962038ee1ac50c478ae530140