Blacklist / configurable timeout [1/2]

Credit/Thanks to lion0738 and Decad3nce

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