Upgrade TODC-bootstrap