[Upg] bootstrap 3.1.1 support