Merge commit '318eeb225f4567a8c2a6fe14baa06e8923ebe622' into lmp-mr1-dev