merge in lmp-release history after reset to b838c23c50f108aff8819c44b11f102e7618fd43