Merge "Component Script Executor Fix"