merge in lmp-mr1-release history after reset to 83605d30176d098b507555856b7275eaa0f69aea