Merge stable changes

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