[forge-commits] [forge/core] 3335b7: Refactoring to have the same behavior as in