Merge "Bug fix: Path to inventory wrong"