- sync vserver branch: will help future merges