sync with hikari defconfig
Merge pull request #1 from MrGezz/evolve-1.15

sync with hikari defconfig