[forge-commits] [forge/core] fe660d: Refactoring