Merge branch 'vendor/TRE'