Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev