merge in lmp-mr1-release history after reset to 1619b73d049f4facd89168ec5b404453edd71cde