Bootstrap update for v3.3.0