Merge "Merge commit 'e837d82731d7455e6c49e006eb7cbd4ba257773e' into merge" into lmp-mr1-dev