merge in lmp-mr1-release history after reset to 79d8e2ac61bd9e82a3baf4ebdbba324350b0d4cf