[seam-commits] [seam/forge] 74d407: manually applied merge from maxandersen