Bootstrap upgrade v2.2.2