merge in lmp-mr1-release history after reset to 4e9139445281885e6cf68939df563955d184d6b9