merge in lmp-release history after reset to beb8f2079e8c43739ed356319caba47a7717e74a