[forge-commits] [forge/core] ec5d31: Compilation fixes from bad merge