merge in lmp-release history after reset to b7d8514822aefbf8274f5464dc12cee151e2b78b