squashed commit 3.4.65-->66-->67

Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>
squashed update 3.4.68

Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>