merge in lmp-release history after reset to e2323bc6eb9dc6aff2f6de0a63e581af4b23da4a