merge in lmp-mr1-release history after reset to 7011ee31d65917a9e15b271942e863f06eee2da1