Merge "SpecialUnusedimages: Use Config instead of globals"