Set Energizer active and transporter active
Merge origin/master