Unified patch 3.4.48

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