merge in lmp-mr1-release history after reset to ca4d5c20d30cd195cc59cacb577a68e274a0b5d7