Squashed commit 3.4.50 -> 3.4.51

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