merger snowsun and wenrui

Signed-off-by: ChunSun <sunchun13@gmail.com>