Bring new changes to defconfig