Pull kconfig into release branch