Merge branch 'black_list_3'