merge in lmp-release history after reset to f856b0939670d052ef01182413d9aaa0824dcd11