merge in lmp-mr1-release history after reset to 48a3723b5dea5257aab2fffd542d23dcc8a0ffbb