CaptureActor as Enter subclass & fixes 6658

Makes CaptureActor a subclass of Enter and fixes #6658.