Update defconfig to r31