Merge "Move the singleton to a common location"