共同的故事

Signed-off-by: Scorpio <scorpiohw@gmail.com>
Merge branch 'ScorpioH'