merge in lmp-mr1-release history after reset to 590e27d80ea424c4370b6801658862389fae5959