merge in lmp-release history after reset to ee264080c731d5385b92b8ef35501a45e940a122