merge in lmp-mr1-release history after reset to 9eb8c8bdbe4965e9a92d83882e97cf67aee20821