Rearranged the debug output
Merge branch 'config' into rebuild