Merge "Revert "namespace: add ShallowResolve""