[INTERNAL] Moved from extras to core.