Merge "SpecialNewImages: Use Config instead of globals"