merge torino_defconfig_updated