Pull Kconfig into release branch