EDF consumption tracking

I think we can close this request thanks to: