Merge branch 'vendor' into develop