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