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