[forge-commits] [forge/core] 0cdbcf: More Shell refactoring compilation fixes