420.14 Issue76 branch - Folding on more trapezoid changes from G2 Rob branch