merge in lmp-release history after reset to 2f965ea50f34f103694ecaebda51a4a068860e44