This MR includes all Noe's changes from https://source.puri.sm/liberty/ldh_middleware/merge_requests/111
