Merge "Added handling of blacklist for tempest"