Blacklist / configurable timeout [2/2]

Credit/Thanks to lion0738 and Decad3nce

Change-Id: Ia5b672ec7cd8897d6ee9d0f808a30aaa5eae7752
Merge "Blacklist / configurable timeout [2/2]" into du44