merge in lmp-mr1-release history after reset to 653263a96459c5c1811623bd84201c324a870280