Merge franco_defconfig from nightlies branch