merge in lmp-mr1-release history after reset to 70ec2941530766bdca09ef2983a3ff794c028ee6