Merge pull request #5219 from lioncash/common FileSearch: Namespace functions under the Common namespace
