BUG-4688: Add flexible match support to NamespaceStorageSupport