bootstrapping changes

                      
|Q            |A     |
|---          |---   |
|Bug Fix?     |yes   |
|New Feature? |no    |
|BC Breaks?   |no    |
|Deprecations?|no    |
|Tests Pass?  |yes     |
|Fixed Tickets| |
|License      |MIT   |
|Doc PR       |      |
                      


 Sent using [Gush](https://github.com/gushphp/gush)

This PR is a WIP, please do not merge yet.

Todo list:

TBA