[genlist] merge upstream 2nd