[forge-commits] [forge/core] f00d4e: FORGE-2319: Internal refactoring