Fix all section mismatches and some changes in defconfig to test the stability
Revert