merge in lmp-mr1-release history after reset to 55157d27305d06569f0bd7d3c47ec51855f87da4