merge in lmp-release history after reset to faa1dc5c016c18bb7e224bb7f16f41989d1d7c23