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