merge in lmp-release history after reset to dc3814bcf916b58ec11251a530c4ecacb6e2b7c9