merge in lmp-mr1-release history after reset to 7dad96889eba4ba145f58d3cc8d22a9cab70165e