merge in lmp-mr1-release history after reset to 7e39749f16236356a0d75523ad1d37c1d4ce39e1