[forge-commits] [forge/core] a8dab8: Refactoring still going on...