merge in lmp-mr1-release history after reset to 83bdda7668a587fbf4913a1e55892991022b4456