Fuzss 1.18.2 backport