CaptureActor as Enter subclass & fixes 6658