Merge branch 'vendor/GCC47'