Adapt to other WoltLab/WCF merges too

WoltLab/WCF@
WoltLab/WCF@
WoltLab/WCF@