production scripts porting and bug fix in sample list