merge 19.11
merge 19.11
add black white list to added and deleting Ip