Backport to before-util-vserver-0_30_213-merge

No match.