merge in lmp-release history after reset to f06c6eff656f6bf0ac06662ef21e29e446e1a43d