merge in lmp-mr1-release history after reset to 43e0b836cb440f00f2a85ce1cb45d75bc4c0d163