Solve many issues during cherry-picking

Signed-off-by: Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>