merge in lmp-release history after reset to 3f7635f4906c53fa744731efc35235456b7d93bf