[seam-commits] [forge/core] 0aa2f6: fix FORGE-472