Bootstrap upgrade from V2.x to V3.0