merge in lmp-mr1-release history after reset to 6c4e16f634a8ee07fc0c3cc5299c9f7f03c5f8bf