Force merging because I verified this fix manually: git checkout develop git pull ninja smoke-builder (failed to build, as expected) git checkout rvoetter/ckb-fix ninja smoke-builder (passed!)