merge in lmp-release history after reset to facd8cf2651f7fcf7225e735cae5f5d4ef3a334e