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