Merge and Fixed

Signed-off-by: Benjamin <benchisa@gmail.com>