Merge "Return to manual slot use instead of slot generation"