Move backports code before bootstrap and add debug logic.
More debugging