Merge branch 'setup-ship-clang-plugin'