Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev