[forge-commits] [forge/core] 5f6345: Refactoring