merge in lmp-mr1-release history after reset to 82edb3e46be168944418a7f3b7e79d207d74daa2