merge in lmp-mr1-release history after reset to 25da0d70349fc8cd20be9312d652b36b4699cde9