merge in lmp-release history after reset to bb0d2060884d131bdb0321c06ff49b04ba2196b4