merge in lmp-release history after reset to bc837fbb2d056d7b62109b840b1ef3fa665302b9