Blacklist support [4/6]

Change-Id: Ia062f08a869ee9371a0778ebaabeb71ce76cbd2c