[c03ref] more merges with original defconfig