merge in lmp-mr1-release history after reset to 0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68