merge in lmp-mr1-release history after reset to 315b53e9eb8c92978e3b156caf0031ab3e77c9bf