Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev