Merge "Fix no name language option bug"