merge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20