[forge-commits] [forge/core] 0ef044: Refactoring #2