[Upg] bootstrap 3.1.1 support
Merge branch '1.1' into 1.2
Merge branch '1.2'