merge in lmp-mr1-release history after reset to 171fa1607e8bc3e94c2c9ff080777fcdf06f60d9