merge in lmp-mr1-release history after reset to a94282c6598ed91e260b7bdf199ff3db7d6c5a92