merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa83fe47b74be