am 55f53f28: Merge commit \'58b0b676\' into merge-lmp-mr1-ub-dev-8

* commit '55f53f28e1802935c0eeeb554e21e774e18b04e6':