Merge pull request #6669 from kahirokunn/cluster-inventory-namespaces