master commit 2

Signed-off-by: Kai Chen <kai.chen@arec.com>