[seam-commits] [forge/core] ec6ac2: FORGE-548