Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev