merge alldebrid changes from frodo