Merge branch 'vendor/EE'