Merge origin/energy-conservation-poc (--to/--gen flags, train date-prefix)
Both commits' changes were already folded in by hand in the previous commit; this merge just records the shared history so the branches reconcile cleanly.
This commit is contained in: