Fixes #18186 (auf meinem ZI Server getestet)
assigned to @carsten.rose
mentioned in commit fdb6a94c
merged