[development] Patch Spotlight 2.0