fix workbench vs vendor directory
Merge branch 'master' into develop