merge in lmp-mr1-release history after reset to ada1f9290fc266f5277fbed88b02faf2a4f93ff8