Issue #3084329 by aaronbauman, osopolar: Create unique entities to avoid re-use between references
Closes #3084329