Merge "Add more namespaces to namespace list." into main