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