Updated defconfig to r24