Bootstrap upgrade

Upgrade from 2.2.2 -> 3.2.0