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