Merge pull request #6885 from lioncash/namespace Common/CodeBlock: Namespace code under the Common namespace
