merges master with test-offloadinventory somehow