Merge "Add python3 support in energy"