Merge upstream changes

Signed-by: Ｖ字龍(Vdragon)<Vdragon.Taiwan@gmail.com>