merge in lmp-mr1-release history after reset to 810657ee2f7329a4aa11c60d1392a6de8e659d19