[Energy] Item order changes
[Core] Item group change