merge in lmp-mr1-release history after reset to 53aad5e7de7619cbc9b0d9a0a0830fc29c331f8d