[DF-185] Added RemoveComponent() before AddComponent()