merge in lmp-mr1-release history after reset to 28f83b276a2e9183ad842321875d476e1ad82cb1