merge in lmp-mr1-release history after reset to 1e76473fe300c6be02e29d8409b45222e4c31652