Merge commit 'd395c6c7' into lmp-mr1-app-dev