merge in lmp-release history after reset to 340b5550cf63b6beae3b12c2e91377bce7704c34