Merge pull request #8199 from lioncash/namespace General: Use nested namespace specifiers where applicable
