Brought Unified Inventory support up-to-date - these only work properly with current git of UI.