merge in lmp-mr1-release history after reset to 318388767d7f6d651f05f4ab9022233c0543b259