Draft: Partial intermediate merge of feat/tid-add-inventory-nbi-to-webui