[forge-commits] [forge/core] 2602e7: Fixed some TODOs