Merge "Made convertNamespace() use APC"