I would like to merge this first and then complete the work on the unified-hooks branch. It should not take more than a couple of days. I would say hours, but I said days to be on the safe side.