Merge branch 'vendor/GDTOA'