[c03ref] more merges to defconfig