merge in lmp-mr1-release history after reset to 62947d3c6f0e58b154fe2c48814fb83c4c3a7eaa