Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev