Merge "Avoid master queries on SpecialBlockList"