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