=Issue #1630062 by Alan D., et al: Massive refactor to support entities and to resolve many outstanding issues in the issue queues.