[Upg] bootstrap 3.3.0
Merge branch '1.2'