merge in lmp-mr1-release history after reset to 3216ca840696de7c7d69b7e10ca6f2bdb592ff47