Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev