merge in lmp-mr1-release history after reset to 597bfe1e0b154df60a8ad9322ff6f248c617a9c1