merge in lmp-mr1-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5