merge with a5dug

Signed-off-by: Willi Ye <williye97@gmail.com>