Merge "Add parameter for shared namespaces"