merge in lmp-mr1-release history after reset to 708e021a319eea4cb549a73745fafb9467776fcf