merge in lmp-mr1-release history after reset to 3c0190ff5bc74ba7102691b3e2db3c867a2e2442