[forge-commits] [forge/core] 27132b: Continued refactoring