Merge branch 'kconfig-text' into release