Sync with latest framework benchmark setup script changes