Merge pull request #269 from qiangdavidliu/2.x

Bootstrap config refactor