fixed more vendor/repair bugs
Merge remote-tracking branch 'origin/beta' into beta