fix Plane actor instantiation to use mixins
remove GiveMeControl message to context.parent because hierarchy has changed
merge regression-fix and fix conflicts