Added --no-test-tokens
Merge remote-tracking branch 'origin/reuse_bootstrap'